From: Jeffrey C Honig <jch@bsdi.com>
Date: Mon, 20 Aug 2007 02:32:44 +0000 (+0000)
Subject: (mh-mml-forward-message): Address SF 1378993 and
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~17318
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=83d875d04f073609483518aef17eac02c71b44f9;p=emacs.git

(mh-mml-forward-message): Address SF 1378993 and
forward messages as inline attatchments.
---

diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index eefaa0ed8ac..ffe558d1a62 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -1220,16 +1220,11 @@ MESSAGE number."
                  mh-sent-from-msg
                (string-to-number message))))
     (cond ((integerp msg)
-           (if (string= "" description)
-               ;; Rationale: mml-attach-file constructs a malformed composition
-               ;; if the description string is empty.  This fixes SF #625168.
-               (mml-attach-file (format "%s%s/%d"
-                                        mh-user-path (substring folder 1) msg)
-                                "message/rfc822")
-             (mml-attach-file (format "%s%s/%d"
-                                      mh-user-path (substring folder 1) msg)
-                              "message/rfc822"
-                              description)))
+           (mml-attach-file (format "%s%s/%d"
+                                    mh-user-path (substring folder 1) msg)
+                            "message/rfc822"
+                            (if (string= "" description) nil description)
+                            "inline"))
           (t (error "The message number, %s, is not a integer" msg)))))
 
 (defun mh-mh-forward-message (&optional description folder messages)